diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
index 1daa4a1..23c4007 100644
--- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
@@ -54,3 +54,4 @@
 CONFIG_OF_LIBFDT=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig
index 9a5f52c..ace0a7d 100644
--- a/configs/BSC9131RDB_NAND_defconfig
+++ b/configs/BSC9131RDB_NAND_defconfig
@@ -53,3 +53,4 @@
 CONFIG_OF_LIBFDT=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
index 3911c21..7eccac1 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
@@ -62,3 +62,4 @@
 CONFIG_OF_LIBFDT=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
index db6c8ac..dcd0174 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
@@ -62,3 +62,4 @@
 CONFIG_OF_LIBFDT=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index 040a4c5..320c78a 100644
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -32,3 +32,4 @@
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig
index d125003..c14e8f0 100644
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -167,3 +167,4 @@
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig
index e0fbd8d..dfee6d3 100644
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -166,3 +166,4 @@
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
index 03a71e9..91e8fa1 100644
--- a/configs/Nintendo_NES_Classic_Edition_defconfig
+++ b/configs/Nintendo_NES_Classic_Edition_defconfig
@@ -28,3 +28,4 @@
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index df085dd..19395a0 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -69,3 +69,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index f17dc71..6c5bbb1 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -68,3 +68,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index c5a5d18..02a7584 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -69,3 +69,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index b03d30c..5ade927 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -68,3 +68,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index 7b4ada4..3e46354 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -77,3 +77,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_DM_MMC=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1021RDB-PC_36BIT_NAND_defconfig b/configs/P1021RDB-PC_36BIT_NAND_defconfig
index 8309225..993a4e0 100644
--- a/configs/P1021RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1021RDB-PC_36BIT_NAND_defconfig
@@ -74,3 +74,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1021RDB-PC_NAND_defconfig b/configs/P1021RDB-PC_NAND_defconfig
index 030b9b4..780b042 100644
--- a/configs/P1021RDB-PC_NAND_defconfig
+++ b/configs/P1021RDB-PC_NAND_defconfig
@@ -73,3 +73,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig
index 186af9a..7cc83ea 100644
--- a/configs/P1022DS_36BIT_NAND_defconfig
+++ b/configs/P1022DS_36BIT_NAND_defconfig
@@ -70,3 +70,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig
index e032e53..1e912cd 100644
--- a/configs/P1022DS_NAND_defconfig
+++ b/configs/P1022DS_NAND_defconfig
@@ -69,3 +69,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index 5ebf196..751c602 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -79,3 +79,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_DM_MMC=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index 01115d1..f6c593d 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -78,3 +78,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_DM_MMC=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
index 867712b..6b0c712 100644
--- a/configs/T1023RDB_NAND_defconfig
+++ b/configs/T1023RDB_NAND_defconfig
@@ -72,3 +72,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index 881290f..01e4918 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -77,3 +77,4 @@
 CONFIG_VIDEO=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index f9f8e09..59064f9 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -80,3 +80,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_DM_MMC=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig
index 8c68763..5203851 100644
--- a/configs/T1040D4RDB_NAND_defconfig
+++ b/configs/T1040D4RDB_NAND_defconfig
@@ -71,3 +71,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
index 23d2750..cf142f9 100644
--- a/configs/T1040RDB_NAND_defconfig
+++ b/configs/T1040RDB_NAND_defconfig
@@ -72,3 +72,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index b0df96c..e0cc5bb 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -80,3 +80,4 @@
 CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_DM_MMC=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
index 19fcdbd..5dd335c 100644
--- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
@@ -81,3 +81,4 @@
 CONFIG_RSA_SOFTWARE_EXP=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index abe5f93..b6c7a2b 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -76,3 +76,4 @@
 CONFIG_CFB_CONSOLE_ANSI=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index 9a40dc3..0315114 100644
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -81,3 +81,4 @@
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
index b9348b4..530b92a 100644
--- a/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@ -78,3 +78,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_DM_MMC=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig
index d688694..5fec8c5 100644
--- a/configs/T2081QDS_NAND_defconfig
+++ b/configs/T2081QDS_NAND_defconfig
@@ -70,3 +70,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 8d7f816..50489fc 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -80,3 +80,4 @@
 CONFIG_LZO=y
 # CONFIG_OF_LIBFDT_OVERLAY is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
index bf0ffd5..e804a78 100644
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -71,3 +71,4 @@
 CONFIG_RSA=y
 CONFIG_LZO=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig
index 1e11f5a..69ed050 100644
--- a/configs/am335x_hs_evm_uart_defconfig
+++ b/configs/am335x_hs_evm_uart_defconfig
@@ -73,3 +73,4 @@
 CONFIG_RSA=y
 CONFIG_LZO=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig
index 103acfc..fc55ef1 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -75,3 +75,4 @@
 CONFIG_FDT_FIXUP_PARTITIONS=y
 # CONFIG_GENERATE_SMBIOS_TABLE is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 4e1f6d6..b4e3e2e 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -81,3 +81,4 @@
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_ETHER=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig
index d78bdb5..05e9e07 100644
--- a/configs/am43xx_evm_rtconly_defconfig
+++ b/configs/am43xx_evm_rtconly_defconfig
@@ -62,3 +62,4 @@
 CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 38f3e07..51ce1c5 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -74,3 +74,4 @@
 CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index df37111..ef3e20a 100644
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -72,3 +72,4 @@
 CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/ap152_defconfig b/configs/ap152_defconfig
index 29a782c..e1db7a4 100644
--- a/configs/ap152_defconfig
+++ b/configs/ap152_defconfig
@@ -49,3 +49,4 @@
 CONFIG_DM_SPI=y
 CONFIG_ATH79_SPI=y
 CONFIG_LZMA=y
+CONFIG_MTD=y
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 69a5a4f..55b4e4b 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -70,3 +70,4 @@
 CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index 2c466b8..4f7e5f7 100644
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -68,3 +68,4 @@
 CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index de30940..86d5455 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -69,3 +69,4 @@
 CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index ae6fb50..fa94273 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -61,3 +61,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index 87dc4f1..dc0e54d 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -63,3 +63,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index 183e6e5..a1038ce 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -75,3 +75,4 @@
 CONFIG_HEXDUMP=y
 # CONFIG_EFI_LOADER is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 5ffc51a..d62b85d 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -99,3 +99,4 @@
 # CONFIG_OF_LIBFDT_OVERLAY is not set
 # CONFIG_EFI_LOADER is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index 37deabc..5002a35 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -38,3 +38,4 @@
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig
index dbd370b..d1749b7 100644
--- a/configs/chiliboard_defconfig
+++ b/configs/chiliboard_defconfig
@@ -59,3 +59,4 @@
 CONFIG_FAT_WRITE=y
 CONFIG_LZO=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 763569d..9f8d71b 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -91,3 +91,4 @@
 CONFIG_VIDEO=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index 079571e..06fec41 100644
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -54,3 +54,4 @@
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index 6af08a1..6b1f48d 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -63,3 +63,4 @@
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 75f6693..2868311 100644
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -80,3 +80,4 @@
 CONFIG_OMAP_USB_PHY=y
 CONFIG_FAT_WRITE=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 957b47a..9d19052 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -65,3 +65,4 @@
 CONFIG_USB_GADGET_DOWNLOAD=y
 # CONFIG_EFI_LOADER is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index 4ae75b3..f078840 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -80,3 +80,4 @@
 CONFIG_USB_MUSB_DA8XX=y
 CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
+CONFIG_MTD=y
diff --git a/configs/db-88f6281-bp-spi_defconfig b/configs/db-88f6281-bp-spi_defconfig
index 9f6469d..7e5d454 100644
--- a/configs/db-88f6281-bp-spi_defconfig
+++ b/configs/db-88f6281-bp-spi_defconfig
@@ -59,3 +59,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_LZMA=y
 CONFIG_LZO=y
+CONFIG_MTD=y
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 9a2d007..121feb8 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -35,3 +35,4 @@
 CONFIG_CONS_INDEX=3
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 5db7f58..969ef6b 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -88,3 +88,4 @@
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_ETHER=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 409b335..746f2aa 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -89,3 +89,4 @@
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_ETHER=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
index 695cd17..1a45369 100644
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -47,3 +47,4 @@
 CONFIG_FDT_FIXUP_PARTITIONS=y
 # CONFIG_EFI_LOADER is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 6537e74..8905f03 100644
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -65,3 +65,4 @@
 CONFIG_BCH=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig
index aacac7e..218646a 100644
--- a/configs/lion-rk3368_defconfig
+++ b/configs/lion-rk3368_defconfig
@@ -64,6 +64,7 @@
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_MICREL=y
diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig
index b71e7f0..e3c5564 100644
--- a/configs/mscc_jr2_defconfig
+++ b/configs/mscc_jr2_defconfig
@@ -71,3 +71,4 @@
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_LZMA=y
+CONFIG_MTD=y
diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig
index 040362d..6a37384 100644
--- a/configs/mscc_luton_defconfig
+++ b/configs/mscc_luton_defconfig
@@ -75,3 +75,4 @@
 CONFIG_DM_SPI=y
 CONFIG_MSCC_BB_SPI=y
 CONFIG_LZMA=y
+CONFIG_MTD=y
diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig
index 587e648..fe4ccf7 100644
--- a/configs/mscc_serval_defconfig
+++ b/configs/mscc_serval_defconfig
@@ -67,3 +67,4 @@
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_LZMA=y
+CONFIG_MTD=y
diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig
index ee22274..71096ab 100644
--- a/configs/mscc_servalt_defconfig
+++ b/configs/mscc_servalt_defconfig
@@ -64,3 +64,4 @@
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_LZMA=y
+CONFIG_MTD=y
diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig
index c43884b..eb2ec31 100644
--- a/configs/mx35pdk_defconfig
+++ b/configs/mx35pdk_defconfig
@@ -50,3 +50,4 @@
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig
index cd108c2..3503de4 100644
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@@ -39,3 +39,4 @@
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 87fa2e8..5ce3855 100644
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -63,3 +63,4 @@
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 817a492..ecfc2a5 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -94,3 +94,4 @@
 CONFIG_SYS_CONSOLE_BG_COL=0xff
 CONFIG_SYS_CONSOLE_FG_COL=0x00
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 31ef0ab..4d405a5 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -89,3 +89,4 @@
 CONFIG_USB_ETHER=y
 CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index e4af9e5..4c32a23 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -94,3 +94,4 @@
 CONFIG_SYS_CONSOLE_BG_COL=0xff
 CONFIG_SYS_CONSOLE_FG_COL=0x00
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index be1e103..d467841 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -116,6 +116,7 @@
 CONFIG_SPL_PWRSEQ=y
 CONFIG_I2C_EEPROM=y
 CONFIG_MMC_SANDBOX=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH_SANDBOX=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index eda595f..ed7ff78 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -136,6 +136,7 @@
 CONFIG_SPL_PWRSEQ=y
 CONFIG_I2C_EEPROM=y
 CONFIG_MMC_SANDBOX=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH_SANDBOX=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index f5613f1..815297c 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -69,3 +69,4 @@
 CONFIG_SPL_TINY_MEMSET=y
 # CONFIG_EFI_LOADER is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
index 0eebe18..5ccff63 100644
--- a/configs/socfpga_mcvevk_defconfig
+++ b/configs/socfpga_mcvevk_defconfig
@@ -62,3 +62,4 @@
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 # CONFIG_SPL_WDT is not set
+CONFIG_MTD=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 7abcf6f..cc7c82f 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -92,3 +92,4 @@
 CONFIG_HEXDUMP=y
 # CONFIG_EFI_LOADER is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 6aaab97..3914744 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -88,3 +88,4 @@
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_ETHER=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig
index 245305f..bb7834f 100644
--- a/configs/ti816x_evm_defconfig
+++ b/configs/ti816x_evm_defconfig
@@ -58,3 +58,4 @@
 CONFIG_OMAP3_SPI=y
 # CONFIG_USE_PRIVATE_LIBGCC is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig
index beea9a2..17d1a5b 100644
--- a/configs/wb45n_defconfig
+++ b/configs/wb45n_defconfig
@@ -39,3 +39,4 @@
 CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
index 6899750..360cf42 100644
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -49,3 +49,4 @@
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
index cd8e98e..749d015 100644
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -61,3 +61,4 @@
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y